projects
/
emacs.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
f6adc23
)
(detect_coding_utf_16): Fix previous change.
author
Kenichi Handa
<handa@m17n.org>
Wed, 17 Jun 2009 00:42:17 +0000
(
00:42
+0000)
committer
Kenichi Handa
<handa@m17n.org>
Wed, 17 Jun 2009 00:42:17 +0000
(
00:42
+0000)
src/ChangeLog
patch
|
blob
|
history
src/coding.c
patch
|
blob
|
history
diff --git
a/src/ChangeLog
b/src/ChangeLog
index 6a6e90aafb947fce327c2d3a0ec2c92ad848420c..21803be7508c8e63102e722e7c0483afc43e1967 100644
(file)
--- a/
src/ChangeLog
+++ b/
src/ChangeLog
@@
-1,3
+1,7
@@
+2009-06-17 Andreas Schwab <schwab@linux-m68k.org>
+
+ * coding.c (detect_coding_utf_16): Fix previous change.
+
2009-06-16 Kenichi Handa <handa@m17n.org>
* coding.c (detect_coding_utf_16): Fix the logic of rejecting
diff --git
a/src/coding.c
b/src/coding.c
index cde56d9af424302a82f6bd4fbcd315bbecf0cec1..6dbf05ce0aa3daadf572a71e2eee854754e87515 100644
(file)
--- a/
src/coding.c
+++ b/
src/coding.c
@@
-1669,7
+1669,8
@@
detect_coding_utf_16 (coding, detect_info)
|CATEGORY_MASK_UTF_16_BE
| CATEGORY_MASK_UTF_16_LE);
- while (detect_info->rejected != CATEGORY_MASK_UTF_16)
+ while ((detect_info->rejected & CATEGORY_MASK_UTF_16)
+ != CATEGORY_MASK_UTF_16)
{
TWO_MORE_BYTES (c1, c2);
if (c2 < 0)